GPSBabel.pro Windows fixes from Gerhard.

diff --git a/gpsbabel/GPSBabel.pro b/gpsbabel/GPSBabel.pro
index dc3f5abdbe93c6fe4f8b6b467a68e465c911240f..1d386aaaa8f4a9d1f889568b4fc12d6a2980bc43 100644 (file)
--- a/gpsbabel/GPSBabel.pro
+++ b/gpsbabel/GPSBabel.pro
@@ -70,7 +70,7 @@ macx|linux {
 
 win32 {
   DEFINES += __WIN32__ _CONSOLE
-  DEFINES -= -UNICODE -ZLIB_INHIBITED
+  DEFINES -= UNICODE ZLIB_INHIBITED
   DEFINES += HAVE_LIBEXPAT
   CONFIG(debug, debug|release) {
     DEFINES += _DEBUG

diff --git a/gpsbabel/msvc/GPSBabel.vcxproj b/gpsbabel/msvc/GPSBabel.vcxproj
index 0be8eb349df654f2efac9e3cf43e116f08f1dffb..f5340a6373ffa68eeaa92b8b22cbcfc33109dc07 100644 (file)
--- a/gpsbabel/msvc/GPSBabel.vcxproj
+++ b/gpsbabel/msvc/GPSBabel.vcxproj
@@ -16,7 +16,6 @@
     <ConfigurationType>Application</ConfigurationType>\r
     <PlatformToolset>v110</PlatformToolset>\r
     <UseOfMfc>false</UseOfMfc>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
@@ -32,7 +31,6 @@
     <IncludePath>C:\Qt\5.1.0\msvc2012\include;$(IncludePath)</IncludePath>\r
     <OutDir>.\$(Configuration)\</OutDir>\r
     <IntDir>.\$(Configuration)\</IntDir>\r
-    <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <Midl>\r
@@ -40,7 +38,8 @@
       <HeaderFileName />\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>expat;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>\r
       <WarningLevel>Level3</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
@@ -58,12 +57,14 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <AdditionalDependencies>setupapi.lib;hid.lib;qt5core.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>setupapi.lib;hid.lib;qt5cored.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention />\r
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>true</DataExecutionPrevention>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <OutputFile>.\$(Configuration)/GPSBabel.exe</OutputFile>\r
       <ProgramDatabaseFile>.\$(Configuration)/GPSBabel.pdb</ProgramDatabaseFile>\r
@@ -73,9 +74,8 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <BrowseInformation>true</BrowseInformation>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -88,7 +88,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>\r
       <WholeProgramOptimization>true</WholeProgramOptimization>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r